From f70568dc7fdff0b421da16fd09a7e6f9b54f7253 Mon Sep 17 00:00:00 2001 From: "djm@djmnc4000.(none)" Date: Wed, 23 Mar 2005 22:55:47 +0000 Subject: [PATCH] bitkeeper revision 1.1236.25.33 (4241f3f3eyBU3BiRjebWKwY9VtfWJQ) Back out asm-offsets.h circular dependency fix --- xen/arch/ia64/Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile index a6365cc286..b826c83b8b 100644 --- a/xen/arch/ia64/Makefile +++ b/xen/arch/ia64/Makefile @@ -32,22 +32,9 @@ default: $(OBJS) head.o ia64lib.o xen.lds.s $(OBJCOPY) -R .note -R .comment -S $(TARGET)-syms $(TARGET) # $(BASEDIR)/tools/elf-reloc $(MONITOR_BASE) $(LOAD_BASE) $(TARGET) -asm-offsets.s: asm-offsets.c $(BASEDIR)/include/asm-ia64/.offsets.h.stamp +asm-offsets.s: asm-offsets.c $(CC) $(CFLAGS) -S -o $@ $< -$(BASEDIR)/include/asm-ia64/.offsets.h.stamp: -# Need such symbol link to make linux headers available - [ -e $(BASEDIR)/include/linux ] \ - || ln -s $(BASEDIR)/include/xen $(BASEDIR)/include/linux - [ -e $(BASEDIR)/include/asm-ia64/xen ] \ - || ln -s $(BASEDIR)/include/asm-ia64/linux $(BASEDIR)/include/asm-ia64/xen -# Solve circular reference on asm-offsets.h - [ -f $(BASEDIR)/include/asm-ia64/asm-offsets.h ] \ - || echo "#define IA64_TASK_SIZE 0" > $(BASEDIR)/include/asm-ia64/asm-offsets.h -#Bad hack. Force asm-offsets.h out-of-date - sleep 1 - touch $@ - # I'm sure a Makefile wizard would know a better way to do this xen.lds.s: xen.lds.S $(CC) -E $(CPPFLAGS) -P -DXEN -D__ASSEMBLY__ \ -- 2.30.2